I'm okay with this for the existing branches if the changes are simple, but it should also fix PHP-8.4 then.

I sure will, but there the only problem is str_ends_with, which is no longer used in PHP-8.5, so I thought I thought I would start from this branch.

I'll also send the PR for 8.4, then you can figure in which order to apply them.

so I thought I thought I would start from this branch.

Bugfixes are always applied to the lowest applicable branch. I understand that in this case it's two separate issues with both of them affecting only one branch, but nevertheless fixing the older one first seems to be the correct choice.

so I thought I thought I would start from this branch.

Bugfixes are always applied to the lowest applicable branch. I understand that in this case it's two separate issues with both of them affecting only one branch, but nevertheless fixing the older one first seems to be the correct choice.

Sounds right, I opened another PR for 8.4, I guess you could also do some dark magic during merge and apply that one in 8.4 and in phase of conflict resolution reset and apply this one. The only problem with burying changes in a merge commit is that they don't show up in git log -p, which is unfortunate.

Thank you!